Continue to tweak the win64 build process on the bots

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index 5e9acbe0a1a6f6ceab49c9ffdc758f3d7e7ffb2a..a9b0ecae8ff69ba0d4ef4509aec3a985553fb6f4 100755 (executable)
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -65,14 +65,12 @@ else
     curl -O http://$host/dist/rust-nightly-$v32.exe
     curl -O http://$host/dist/rust-nightly-$v64.exe
     if [ "${BITS}" = "64" ]; then
-        # innoextract comes from the mingw-w64-x86_64-innoextract package
-        innoextract rust-nightly-$v64.exe
-        mv app rustc
-        innoextract rust-nightly-$v32.exe
-        mv app/bin/libgcc_s_dw2-1.dll rustc/bin
-        rm -rf app
+        innounp -y -x rust-nightly-$v64.exe
+        mv '{app}' rustc
+        innounp -y -x rust-nightly-$v32.exe
+        mv '{app}/bin/libgcc_s_dw2-1.dll' rustc/bin
+        rm -rf '{app}'
     else
-        # innounp came from a random download on the internet! (search google)
         innounp -y -x rust-nightly-$v32.exe
         mv '{app}' rustc
     fi

diff --git a/configure b/configure
index 255b51bfc34f5db3f2f83275bdf1ee1b50766ff1..e825ba7e78d5a5be7b74328e0737bdc201f914a7 100755 (executable)
--- a/configure
+++ b/configure
@@ -355,12 +355,6 @@ CFG_MANDIR=${CFG_MANDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
 
-# Temporary support for the old windows triples. Remove when rust also removes
-# this
-CFG_BUILD=`echo "${CFG_BUILD}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
-CFG_HOST=`echo "${CFG_HOST}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
-CFG_TARGET=`echo "${CFG_TARGET}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
-
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""
 for i in $CFG_HOST $CFG_TARGET;